package com.example.gitstudy.day1;

public class File1 {

    public static void main(String[] args) {
        System.out.println("我试试修改能不能合");
    }

    String tips1 = "git log master --not --remotes --oneline"; //查看本地未push的commit

    String tips2 = "git reset --soft HEAD^"; //撤销最近一次提交，并保留更改内容，将HEAD指向倒数第二次commit

    String tips3 = "git commit -c ORIG_HEAD"; //修改最近一次提交的备注

    String tips4 = "git rm --cached test.txt"; //移除git控制，取消追踪

    String tips5 = "git reflog"; //查看使用命令记录

    String tips6 = "git diff"; //显示工作区与暂存区的差异

    String tips7 = "git diff --cached"; //查看暂存区和仓库差异

    String tips8 = "git diff HEAD"; //查看工作区和仓库的差异

    String tips9 = "git restore src/main/java/com/example/gitstudy/day1/test.java"; //撤销修改

    String tips10 = "git restore --staged src/main/java/com/example/gitstudy/day1/test.java"; //从暂存区撤销回到工作区，保留修改内容

    String tips11 = "git checkout -- src/main/java/com/example/gitstudy/day1/test.java"; //用版本库里的版本替换工作区的版本，无论工作区是修改还是删除，都可以“一键还原”

    String tips12 = "git push -u origin feat-785-dev"; //第一次推送并关联远程分支

    String tips13 = "git switch -c lidap"; //创建并切换到该分支

}
